blktap2: Remove set() for Python 2.3
authorKeir Fraser <keir.fraser@citrix.com>
Mon, 20 Jul 2009 09:08:12 +0000 (10:08 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Mon, 20 Jul 2009 09:08:12 +0000 (10:08 +0100)
Signed-off-by: KUWAMURA Shin'ya <kuwa@jp.fujitsu.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
tools/python/xen/xend/server/BlktapController.py

index 4c11cf7329349e86a2c5f930ea16c68f67669a75..5ea988ebe123446a02f752db383b3d0fab901373 100644 (file)
@@ -13,7 +13,7 @@ TAPDISK_BINARY  = '/usr/sbin/tapdisk2'
 TAPDISK_DEVICE  = '/dev/xen/blktap-2/tapdev'
 TAPDISK_CONTROL = TAPDISK_SYSFS + '/blktap'
 
-blktap1_disk_types = set([
+blktap1_disk_types = [
     'aio',
     'sync',
     'vmdk',
@@ -21,16 +21,16 @@ blktap1_disk_types = set([
     'qcow',
     'qcow2',
     'ioemu',
-    ])
+    ]
 
-blktap2_disk_types = set([
+blktap2_disk_types = [
     'aio',
     'ram',
     'qcow',
     'vhd',
-    ])
+    ]
 
-blktap_disk_types = blktap1_disk_types | blktap2_disk_types
+blktap_disk_types = blktap1_disk_types + blktap2_disk_types
 
 def doexec(args, inputtext=None):
     """Execute a subprocess, then return its return code, stdout and stderr"""